dnd: Fix compiler warnings
authorMatthias Clasen <mclasen@redhat.com>
Sun, 31 May 2015 01:25:05 +0000 (21:25 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 2 Jun 2015 13:08:15 +0000 (09:08 -0400)
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.

gtk/gtkdnd.c

index 59b883da92451f67e07bebc62a1f2d30c514170e..6c65e0bd381f7c0352a6cde54b56a1facb6e8399 100644 (file)
@@ -3776,16 +3776,16 @@ gtk_drag_source_event_cb (GtkWidget *widget,
                                     start_x + offset_x, start_y + offset_y))
         {
           GdkEventSequence *sequence;
-          const GdkEvent *event;
+          const GdkEvent *last_event;
           guint button;
 
           sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (site->drag_gesture));
-          event = gtk_gesture_get_last_event (site->drag_gesture, sequence);
+          last_event = gtk_gesture_get_last_event (site->drag_gesture, sequence);
           button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (site->drag_gesture));
 
           gtk_event_controller_reset (GTK_EVENT_CONTROLLER (site->drag_gesture));
           gtk_drag_begin_internal (widget, site, site->target_list,
-                                   site->actions, button, event,
+                                   site->actions, button, last_event,
                                    start_x, start_y);
           return TRUE;
         }